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

Change-Id: I9f9acb3536caed21800bb6318c87fb455c23231e