Merge changes from topic "am-57e0d74080e946758c2b4cbce9ad25bc" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 554eef13 -s ours am: 17cdad7b -s ours am: 48891c07 -s ours am: a60aea0e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7334d82b -s ours am: c517a55c -s ours am: 27801a95 -s ours am: 2862107c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a4a4ea4f -s ours am: 8dd4bd57 -s ours am: 3439724b -s ours am: c68b1e03 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0bb27f4 -s ours am: f7576e1c -s ours am: 5807b2a6 -s ours am: e02b17b6 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: dad4cddf -s ours am: 8b96e1da -s ours am: cf809095 -s ours am: 4d5eca1f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c810e5de -s ours am: 9934b62e -s ours am: 7ccf93ff -s ours am: 87c27a1e -s ours