Merge changes from topic "am-59bde7f2-9903-448c-9ad1-8364ed396cf3" into nyc-mr2-dev

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