Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: d97c62a1da  -s ours am: 0c4e13b41d  -s ours" into oc-dr1-dev-plus-aosp