Merge "[automerger skipped] Import translations. DO NOT MERGE am: a58e5de4c9 -s ours am: 2580a067e1 -s ours" into rvc-qpr-dev-plus-aosp