Merge "Hide Media*2 APIs" into pi-dev
am: d847d7d0a9

Change-Id: I29a18f6592ecc3f79483dacea6ca294a226ca792