Merge "[automerger skipped] Import translations. DO NOT MERGE am: 2c03529e -s ours am: a3f75d5f -s ours" into rvc-qpr-dev-plus-aosp