Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6159a634d1 -s ours am: 4e68b55e64 -s ours" into tm-qpr-dev-plus-aosp