Merge changes from topic "am-093c91a555b94faba2c0f2d6433106e1" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: b7706a9c -s ours am: 06b963e7 -s ours am: a26461c4 -s ours am: 5907f0e3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5631bd53 -s ours am: c3a159cd -s ours am: b9f1ffea -s ours am: 20c123a8 -s ours