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

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