Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:...
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 096ea4c8 -s ours" into nyc-mr1-dev-plus-aosp
am: 6e05654a -s ours
* commit '6e05654a':
Import translations. DO NOT MERGE
Change-Id: I2e15011754d0293aaa0caef7efba6aa7a60023a3