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