Merge "Replace proxy class names with deterministic ones for test output."