Merge "fix: NCs in mediaextractor" into oc-dev
am: babd396d8e

Change-Id: I50c1b2fe31469d2193c7ec144ce545b3b13eb336