am 551ee874: am 94f1de7a: am 27c91491: am 8c54c861: (-s ours) am 2fee69e0: am 071206b4: am aab9d9a7: (-s ours) am 1a434aa8: am 697c511d: am 80c668f2: Remove references to non-std Java classes. [DO NOT MERGE]

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