Merge "Change BumpPointerSpace main block header to not be in space data."