Merge "Update change annotations and pull missing OpenJDK8u121-b13 change"
am: b53dba0f20

Change-Id: Ib38307b2f18d094581396ed75031372bc0b4872f