Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70441941 -s ours am: da629160 -s ours" into rvc-qpr-dev-plus-aosp