Merge "Import translations. DO NOT MERGE am: 961b18d42f  -s ours am: 4f596f6cf7  -s ours" into oc-dr1-dev-plus-aosp