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

Change-Id: I00e9eed89a8a74706f707966516a697d9bb40832