Merge "Remove volume_feature_enabled.volume_services"