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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 0fe4a203 -s ours am: 2a14501b -s ours am: acacc525 -s ours am: 2fddcf23 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d40627d6 -s ours am: 6b02effb -s ours am: 0bd2018c -s ours am: 196b018a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: d84f12ae -s ours am: 2169aabe -s ours am: 20285534 -s ours am: 73262394 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4d57745 -s ours am: 7c813422 -s ours am: 5e6a124b -s ours am: b25ee083 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9dfff595 -s ours am: db5dbd70 -s ours am: 59150078 -s ours am: 9b0da69d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 11837eda -s ours am: 9448ef30 -s ours am: 9550854c -s ours am: 52b5a132 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 1899b464 -s ours am: d6b483b2 -s ours am: 021f8ad5 -s ours am: 2ecfd5b4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9643ff3b -s ours am: 2729a2f1 -s ours am: c909a04c -s ours am: e24d0374 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: bdb5b2b3 -s ours am: a414e50c -s ours am: a320d3e7 -s ours am: e508c310 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8cf3d3c8 -s ours am: 8b7afaa5 -s ours am: 74ca2d43 -s ours am: 529f1b21 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c8cd28e6 -s ours am: 81413db6 -s ours am: 07ceb3e2 -s ours am: 0651ebba -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5bb04ec -s ours am: b6388d36 -s ours am: 76f5fcd6 -s ours am: 2c22e2ae -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: bc04c5bc -s ours am: ea05e83b -s ours am: f97a367e -s ours am: 5a804e7c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3b266517 -s ours am: 8a7b0c01 -s ours am: 72979d96 -s ours am: 705503ce -s ours