Merge "Adjustments for changes made to java.lang.Class"