DO NOT MERGE ANYWHERE Revert "Revert "Ensure that ...""

This reverts commit a8012117563fe7ecfa5aa9250a339fa8a9210352.

This CL reinstates 3844ea3e9b305e61bd4ad9d327895bd0ec46fa18
to Ensure that fragments are created in added order.

Change-Id: I9d90419edfaf8042e944272897aafa75980bdbc9
2 files changed