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

Change-Id: I2267e23f0aefd5a78899d425677d26f035cdae2b