Merge "Add support for unresolved classes in optimizing."