Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 582a84640e  -s ours" into oc-dev-plus-aosp