Merge changes from topic "am-5957a03bf0504f629c936f15d20b4378" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 4ea9abf4 -s ours am: e462cf39 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 69bd7f8f -s ours am: 8bfe8e56 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 97f516b6 -s ours am: 0e0b2e3e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 281cc6d4 -s ours am: 1ad81629 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: ab6e0bd3 -s ours am: 7ddc607b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b737ccb6 -s ours am: c92672c7 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d0d5dfa0 -s ours am: c57fa04e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d8b6650 -s ours am: 241ad529 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1eb8eb6c -s ours am: 2d70ed29 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5b847f78 -s ours am: 72f0bcd3 -s ours