Merge "Merge "Revert "Ensure that fragments are created in added order."" into mnc-ub-dev am: 40a2833692  -s ours am: fe119fbf93 am: f6ade216b1" into nyc-mr1-dev-plus-aosp
am: c82a5cc3ab

* commit 'c82a5cc3ab5c43b2cb0b2fdf757480887d0839c6':

Change-Id: I36618c5213b76a113501b119ca49bf95315fe847