Merge "Import translations. DO NOT MERGE" into nyc-dev
am: cace07e727 -s ours
* commit 'cace07e7271723232277e8dfe94799c80926c5ea':
Import translations. DO NOT MERGE
Change-Id: Ib82f00c78c2e08d1d79430198f7cb505f2b2e334
This commit is contained in: