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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: c96c0a82 -s ours am: c61c902a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 93a3571d -s ours am: afe99981 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 83313871 -s ours am: 4be05095 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 56a4b9af -s ours am: f8ae1d66 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 696616a9 -s ours am: 10f9d639 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8c788e25 -s ours am: cf660e05 -s ours