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