Merge "Optimize SwapOffsets() to skip parsing unused information"