Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 18947ba2fa -s ours
* commit '18947ba2fa2acae84a3dfb30bd14ead3d19d1a94':
Import translations. DO NOT MERGE
Change-Id: I42a5885588ddf1d8a0253b0a3afcc42dd08c0a60
This commit is contained in: