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