8235620: Broken merge between JDK-8006406 and JDK-8003559

Reviewed-by: prr
3 files changed