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