Merge "Refine pr23299 exception test."