Cherry pick from b5393fd63f: Missed change - need to conc on params for disk space call