Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 955da90d3e -s ours am: 6fe1a4c513 -s ours" into tm-qpr-dev-plus-aosp