Merge "Remove last call to getComponent(VolumeComponent.class)"