Merge "Cache partial scan results" into udc-mainline-prod