Merge "Reduce class loader updating overhead."