8169505: Update changes by JDK-8159393 to reflect CCC review

Reviewed-by: sundar
2 files changed