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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: bfc341d0 -s ours am: 9ba4002f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3786e5b6 -s ours am: b093b07f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0df5e46a -s ours am: db8f02f5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1ee72c7e -s ours am: d13e19f9 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: ddce0b8d -s ours am: ca438bfb -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 95f68f94 -s ours am: 7d4600fe -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 55348e5a -s ours am: 9fa1a14d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6f80d59 -s ours am: eca01967 -s ours