Properly track fragments from pop operations. am: e7e8d3d3a5
am: 96b9f8f4a0  -s ours

Change-Id: I8ad963a65d56b56d9c6a37841caf7e2aaea996a7