am 1a434aa8: am 697c511d: am 80c668f2: Remove references to non-std Java classes. [DO NOT MERGE]

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