Merge "Hide Media*2 APIs" into pi-dev am: 855617501c
am: 1cbf0b4c60

Change-Id: Ib8febd8195ede10de7307ff3ac3c8daa6c5dcfb9