Merge "Tweak stubs for updatable media"