Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 9da0a744c5  -s ours" into oc-dr1-dev-plus-aosp