Merge changes from topic "am-4a0c0e3d-b1ad-44cf-9088-b37a160bc2ac" into nyc-mr2-dev

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