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

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