Fix prefetched items being evicted by non-prefetch am: 36c4d66a1b am: c0f66a6837
am: 477a605a3d

Change-Id: I040d064000344d7d083a222798dd7d7975e5e71b