Merge "Fix TrySplitNonPairOrUnalignedPairIntervalAt."