Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 1c25c67a6a  -s ours am: 4e2559c62a  -s ours" into nyc-mr1-dev-plus-aosp
am: e88320a9c7  -s ours

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

Change-Id: I90e930779eaa3ff60cb2f5e056b3b131467f14ff