Merge changes from topic "am-72eed970-759d-4148-b4df-72c2aa104b56" into nyc-mr2-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 73534775a6
  Import translations. DO NOT MERGE