Merge changes from topic "am-6f0d1125-8060-4e8b-afe5-8e18597ac90b" into nyc-mr2-dev

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