am 4e6ae02a: am 17bb697b: am ec8df9af: Fix tests for Java 6.
automerge: b3fea86

* commit 'b3fea8671843675db3c091bd4c7c2d4fa31f2917':
  Fix tests for Java 6.