Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 69e41a4e -s ours am: b1b04ddd -s ours" into oc-mr1-dev-plus-aosp