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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 34496ffa -s ours am: e6effddc -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bc32f7b7 -s ours am: 553b1613 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 9f97be3d -s ours am: 300ef882 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8ad4a0ec -s ours am: 6e28208c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: e1ad1502 -s ours am: 1c6866d2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7c658d91 -s ours am: 2c81d76d -s ours