Merge "Fix: fragment destroyed improperly during pop." into nyc-support-25.2-dev am: 5ba6025392
am: a7aa485fab

Change-Id: Icd8ccecb56aee20c712c07e831d6d59891cb47f9