Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: a7f60741ae  -s ours am: 799144a18b  -s ours" into oc-dr1-dev-plus-aosp