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