Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 575df07 -s ours
* commit '575df07b96368683ad4bf36e44b42b5d93fdd9f9':
Import translations. DO NOT MERGE
Change-Id: I5115a6c119a3e206924dc370cd3483ff39c7bf4e
This commit is contained in: