Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:...
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 18947ba2 -s ours" into nyc-mr1-dev-plus-aosp
am: 71f8032a -s ours
* commit '71f8032a':
Import translations. DO NOT MERGE
Change-Id: Iac961329f40592c1f23cec49ee9a0a5e8bfc52d0