Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 4e5641bfa8
-s ours
* commit '4e5641bfa8a27bbcd377e68e2d52d163ddec3011':
Import translations. DO NOT MERGE
Change-Id: I861e2d9156422593779e301b24809bde271d28f5
This commit is contained in: