Merge "Update change annotations and pull missing OpenJDK8u121-b13 change"