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