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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 6cc2060e -s ours am: 0568e49b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65822793 -s ours am: 2467b327 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 42d40675 -s ours am: ab62229f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6277093c -s ours am: 3e608269 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: cebf8cdb -s ours am: 337a4636 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2d90c8f1 -s ours am: ba1ba406 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f04b4a98 -s ours am: a647b256 -s ours