Merge "Revert Media 1.0 API changes for mainline module"