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

* changes:
  Merge changes from topic "tc_change_20" into tm-dev am: 932e0369 am: a04e35fb am: 5fbf943b
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4342e07 am: b2981540 -s ours am: 9fb08e3f -s ours am: d1e2a181 -s ours
  Merge changes from topic "tc_change_20" into tm-dev am: f952acfc am: 6ed81499 am: 0e5dae5f
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: efe0a3ec am: 233cc84b -s ours am: f3a4a4cc -s ours am: a75d103a -s ours
  Merge changes from topic "tc_change_20" into tm-dev am: 7e37bbb2 am: 722f5878 am: 408cbdf2
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c911af5a am: c234000a -s ours am: 852573d4 -s ours am: de3d6da3 -s ours
  Merge changes from topic "tc_change_20" into tm-dev am: 697cc4c6 am: 4c7d273a am: 8efcac92
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3c336461 am: 7f494415 -s ours am: 0fa5a60b -s ours am: 42ee0dec -s ours
  Merge changes from topic "tc_change_20" into tm-dev am: c50d4b58 am: 960ecf03 am: 6237d084
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 5533301e am: 5611011f -s ours am: 3ea0a75f -s ours am: 0f2064e8 -s ours