Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:...
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 2e032b74 -s ours" into nyc-mr1-dev-plus-aosp
am: 90ac2096 -s ours
* commit '90ac2096':
Import translations. DO NOT MERGE
Change-Id: If8e806fe46665e21fa24853dd4bd85c7c48aa0e0