Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bbb29224 -s ours am: 7b31ccc7 -s ours" into tm-qpr-dev-plus-aosp