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: 4b5e9863 am: d326b911 am: 32a00702
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f0185796 am: b53a13a2 -s ours am: 6233a4ce -s ours am: 2b568cf3 -s ours
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 28e5ac65 am: 09659e52 -s ours am: c0cca64b -s ours am: a00df58f -s ours