Merge changes from topic "am-4c5f537596ec4c2880fcaaf62e125f68" into tm-dev

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 7dab4a6ffc -s ours am: eea0986ff5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 95a1ea0a49 -s ours am: 6791de1e2f -s ours