Merge changes from topic "am-8df06f4c-7127-41db-a6a2-64c67bb75497" into nyc-mr2-dev

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