Apply Java 7 adjustments from 3.2.x that had been removed on master
Apply Java 7 adjustments from 3.2.x that had been removed on master