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