Merge changes from topic "am-6c55709f-f895-4072-8c00-5133d079d8d8" into nyc-mr2-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 0697e9e6d7
  Import translations. DO NOT MERGE