Revert "Revert "apply patch to media module""

This reverts commit 1c95b52656785bad004df428dbcc86c6d5be39b5.