Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: dd5886bc5b  -s ours am: 4ec78fa17b  -s ours" into oc-dr1-dev-plus-aosp