Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: ad4773b774 -s ours
* commit 'ad4773b774d905bfcccc3d1dbb45d0f0c27bc12e':
Import translations. DO NOT MERGE
Change-Id: Ia1afdb49580d23fbe60f22f458d169c62bea1e3b
This commit is contained in: