Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 8d95e041 -s ours" into oc-dev-plus-aosp