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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 7822ffa2 -s ours am: 4c9c9628 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2f4ccb28 -s ours am: c9d9fbfd -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: a5f69b83 -s ours am: a7af489d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 190457ee -s ours am: f458cd84 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 14f40856 -s ours am: ddfe916a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c914af14 -s ours am: 620de9d1 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 781f12b3 -s ours am: c727a2b8 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c9b723f7 -s ours am: 5fa4bce5 -s ours