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