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

Change-Id: Ib74a8e12e6a1c563a408e81a19088be5bedd9b07