Merge changes from topic "am-53102a89669442acb2f5cb33367bdeba"

* changes:
  Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49b4ab94b7 -s ours am: 9e020b5dc5 -s ours am: fcf5908f6e -s ours am: ee5792817a -s ours" into tm-qpr-dev-plus-aosp am: f54d0819c5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49b4ab94b7 -s ours am: 9e020b5dc5 -s ours am: fcf5908f6e -s ours am: ee5792817a -s ours am: 1c1c06e040 -s ours