Merge changes from topic "am-a2931c32-1cdf-4972-bc90-19376361d0c9" into nyc-mr2-dev

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