Merge with jdk8u152-b00