Merge "Fix exceptions throwns from negative dist prefetches" into nyc-support-25.2-dev am: 228bbccd6b
am: 416f9ef042

Change-Id: I817f41c7524cb15fc90a8d22ba006224c0f86bda