Merge "Fix CompareUpstreams instructions for jdk8u121-b13 and jdk-9+181."
am: f25e7a8cc9

Change-Id: Id3a9cadffa8b15613c3a95e194d595fd12dc6cb8