This is just some trivial cleanup to get things into a better state to implement parallel segment downloads. Issue: #5978 PiperOrigin-RevId: 308041996
