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

* commit 'e8be90a673feb573d53277f42282955cbf7f58e9':
  Replace proxy class names with deterministic ones for test output.