Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 7c23c990f1  -s ours am: 1a588ec465  -s ours" into oc-dr1-dev-plus-aosp