Merge changes from topic "am-0780d396-7d22-4a82-9dce-ac27e61f4ff4" into nyc-mr1-dev

* changes:
  [automerger] [RESTRICT AUTOMERGE] Added Media Test methods am: 608102d0f7 am: fde0a4d7fb
  [automerger] [RESTRICT AUTOMERGE] Added Media Test methods am: 608102d0f7
  [RESTRICT AUTOMERGE] Added Media Test methods