Merge "Update references to mediaprovider stubs"