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