Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 3f9462d6 -s ours am: 3b790720 -s ours" into oc-mr1-dev-plus-aosp