Merge changes from topic "am-35bb59b00f7043e0ad4ea4c888a6b4d3" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 03cd04d0 -s ours am: 965e705c -s ours am: d821f71a -s ours am: 8698fe86 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 047ed4a3 -s ours am: fc44730a -s ours am: 068383d0 -s ours am: 7646b258 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: af766c57 -s ours am: 631e76fe -s ours am: f2a516b3 -s ours am: 8120da34 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 271118aa -s ours am: 2a88cd3c -s ours am: 489ad825 -s ours am: c1dfccd5 -s ours