Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 86817456ff  -s ours am: fd00212302  -s ours" into oc-mr1-dev-plus-aosp