Merge "Add updatable_media_stub to framework"