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

* commit '17bb697b3bce1b23137553829dd62e0e7c16b472':
  Fix tests for Java 6.