Merge "Add DCHECKS for class-defs only being null for Proxy classes"