Merge "Preserve class loading semantics in optimizing."