Merge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into nyc-mr2-dev

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