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

* commit '4e6ae02a29dd432648a81f3803f3ccf712621d43':
  Fix tests for Java 6.