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

Change-Id: Id9523e20766e68422a2808383623e11f5e799de2