Merge "Remove unnecessary work around for updatable-media" into tm-dev