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

* changes:
  Merge changes from topic "tc_change_22082515_27" into tm-dev am: 7cd54377 am: e9026c02 am: cedaeb04
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 23a8b3d8 am: 63322c5e -s ours am: 598c6627 -s ours am: b4fee107 -s ours
  Merge changes from topic "tc_change_22082515_27" into tm-dev am: 89f768ac am: 9c0655b6 am: 997f1514
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 658e49f6 am: 7148ae3b -s ours am: 95bf46fc -s ours am: a1bbd002 -s ours
  Merge changes from topic "tc_change_22082515_27" into tm-dev am: 45373f06 am: 0bda89b6 am: 1b7146fa
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: afe50819 am: 5682ab92 -s ours am: dee799e3 -s ours am: 7cc1dfc3 -s ours
  Merge changes from topic "tc_change_22082515_27" into tm-dev am: 95b21cec am: 97a03b9d am: bb2be681
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f2dc33f9 am: 18c3710a -s ours am: 662633cc -s ours am: 855889c1 -s ours