Merge "Revert Media 1.0 API changes introduced for making 1.0 updatable"