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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 3f0476ba -s ours am: 6809072d -s ours am: 248f53dd -s ours am: 62900210 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 207eed7a -s ours am: bffdec03 -s ours am: 2e33560a -s ours am: e86904f2 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 534abbe2 -s ours am: 6a17ca1c -s ours am: 0f598338 -s ours am: 1f771ced -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5045c879 -s ours am: d08334ac -s ours am: 2987def2 -s ours am: bd649459 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 6dcb367f -s ours am: 975062a2 -s ours am: a20f85fb -s ours am: 1964922d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b7d89bf5 -s ours am: e6e60944 -s ours am: fbea4b7b -s ours am: 80bebc15 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 41260e7b -s ours am: 9ec83453 -s ours am: 2f3e8ca0 -s ours am: e3aa11a6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b90e218b -s ours am: ba02e47c -s ours am: 6b7c2844 -s ours am: cf0a0f74 -s ours