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