Merge changes from topic "am-37557a04-fa85-46fe-a499-4a0280811f3e" into nyc-mr2-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 39a33e2ffb
  Import translations. DO NOT MERGE