Merge changes from topic "am-9fd37bbd-f227-4135-a674-78c7ef1f0468" into nyc-mr2-dev

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