Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: e1b0fe7600  -s ours
am: eacea0d64f  -s ours

* commit 'eacea0d64f3ecb8a79bd90d1bf1093c327991a76':
  Import translations. DO NOT MERGE

Change-Id: Ie3fbd8ed5bd9fb35a3d86e6e5ab9fcb1189bbfc1