Merge "Revert "Ensure that fragments are created in added order."" into mnc-ub-dev