Merge changes from topic "am-7d015bbe-5b15-41f4-8c66-9e3e62c1ce88" into nyc-mr2-dev

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