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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 59bc423e -s ours am: 9e34a19e -s ours am: 305ccece -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4aff5691 -s ours am: 9a6b580a -s ours am: be961c2e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c5518d5f -s ours am: 9a0367b8 -s ours am: 8c9be5b5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f172dbcd -s ours am: 1b3927cc -s ours am: df241650 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7dd1b32c -s ours am: 3dfaf429 -s ours am: c215d54f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f378e8c0 -s ours am: 8663b0e9 -s ours am: 8b091dc8 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: bd158a83 -s ours am: c2c2b160 -s ours am: 91915167 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6900566d -s ours am: a8ae85cf -s ours am: 76744e0a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3a7a68c1 -s ours am: 21462088 -s ours am: d6c0ec25 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f75f02da -s ours am: cb3fbddd -s ours am: 399aee5c -s ours