Merge "Fix PrefetchRegistry reset, out of bounds exceptions" into nyc-support-25.2-dev am: 9b759d3162
am: cb11905ffa

Change-Id: I56b31f8d8a7f8eee37fcf28bef97cf6d15d6c775