Merge "Add some more tests to those breaking since move to OpenJDK" am: c4252b1179
am: 9fd30bdf1b

* commit '9fd30bdf1babfe34629e2775068ad71192b3475a':
  Add some more tests to those breaking since move to OpenJDK