Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: d9a4a6df ...
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: d9a4a6df -s ours" into nyc-mr1-dev
am: d9b20aa7 -s ours
* commit 'd9b20aa7':
Import translations. DO NOT MERGE
Change-Id: Icaad76e3bbb8cb7250f45da5061ddc6f7dc44e13