Merge "Update change annotations and pull missing OpenJDK8u121-b13 change" am: b53dba0f am: 931d6b6a am: 7b8f1f96 Change-Id: I4b722cd78423055735bc69b351ae70e88d1904f2