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