Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: a0376f250f  -s ours am: fb1469df92  -s ours" into oc-dr1-dev-plus-aosp