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

Change-Id: Icc9936d8bfa7f258757f96e44b393ef162f7aaa1