Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: fa65d11a ...
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: fa65d11a -s ours" into nyc-mr1-dev
am: bb434299 -s ours
* commit 'bb434299':
Import translations. DO NOT MERGE
Change-Id: I853f2818174b6c5653b7414e4a1205d5f1e910b1