Merge "Fix ClassHelper::GetDirectInterface for proxy class"