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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: e8e3c051 -s ours am: f16ea4d8 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d08b6f89 -s ours am: a39aef29 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 42338b61 -s ours am: b5db62a2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3a49ef89 -s ours am: 31d37abc -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 79aafd5f -s ours am: 703dbb43 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fac11d6d -s ours am: f996b3b7 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 9680f19a -s ours am: 7d13b4d7 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: da6ce8c4 -s ours am: 5ad1e6af -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 8a9296ae -s ours am: fcd020af -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c81a54a2 -s ours am: 9a2c650b -s ours