Merge changes from topic "am-6a9a8997-43fc-40a2-827f-5f1c575c8748" into nyc-mr2-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 2c3e611a18
  Import translations. DO NOT MERGE