Merge "Import translations. DO NOT MERGE am: 016b04c806  -s ours am: 5a664d63b9  -s ours" into oc-mr1-dev-plus-aosp