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

* changes:
  Merge changes from topic "tc_change_22080720_11" into tm-dev am: 8df08f2b am: 7189362c am: 4d48725f
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 88184cde am: 1caf2691 -s ours am: 65a6f4f5 -s ours am: 922d273a -s ours
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 407413ca am: fcec1a5b -s ours am: 4c82e2ef -s ours am: f59e4f78 -s ours