am c46ae1e5: (-s ours) am 51332593: am a4579bcf: am 2b6aa287: am c8ab5109: (-s ours) am fd119e4b: am ef15cd61: am 3195ff0a: (-s ours) am b90db3e6: am de3b2c06: am 1ed75bde: Remove references to non-std Java classes. [DO NOT MERGE]

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