799d14348e
Re-apply the same changes as reviewed under JDK-8154191. Reviewed-by: mchung
Re-apply the same changes as reviewed under JDK-8154191. Reviewed-by: mchung