Merge changes from topic "am-8eb97afa-063a-44e2-8d8e-6d5670eb50b6" into nyc-mr2-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 5e25fd88a8
  Import translations. DO NOT MERGE