Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:...
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 3891e8ae -s ours" into nyc-mr1-dev-plus-aosp
am: f954966b -s ours
* commit 'f954966b':
Import translations. DO NOT MERGE
Change-Id: Ifbfb754943cda375e1a2b4af226453e88a24e0ed