Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:...

Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 69e41a4e  -s ours am: b1b04ddd  -s ours" into oc-mr1-dev-plus-aosp
am: a051d645  -s ours

Change-Id: I8b3a2901d0cc289347782f19983b15a4f8b72cb1