Properly track fragments from pop operations.
am: e7e8d3d3a5

Change-Id: Ibffe0f20f43db35f0e0d273d1c78a01040ef71d1