Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 687aeeca -s ours am: 5d977e69 -s ours" into udc-qpr-dev-plus-aosp