Merge "Fix prefetched items being evicted by non-prefetch" into nyc-mr1-dev
am: 9f91f06dca

Change-Id: I80594d5ddf22d54b9ca7f71d04e2409856d75eee