Merge "Stop setting osapi_volume_base_URL"