am 071206b4: am aab9d9a7: (-s ours) am 1a434aa8: am 697c511d: am 80c668f2: Remove references to non-std Java classes. [DO NOT MERGE]

* commit '071206b4b50ce94416042e6f5a0c838de43aace4':
  Remove references to non-std Java classes. [DO NOT MERGE]