Merge "Use HeapReference for SafeGetClass"