Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 75b5199e9d  -s ours am: 5679e1cc6e  -s ours" into oc-dr1-dev-plus-aosp