Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 7b9f32be79 -s ours
* commit '7b9f32be79b545b18ca387b8e37947fbed220601':
Import translations. DO NOT MERGE
Change-Id: Ie240badd55b5c579c8f7b0b7640b38084fd1f47b
This commit is contained in: