Merge "Revert "Allow proxies to be compared.""
am: 2fc621f0a6

Change-Id: I272909f0d49da647b12ee61d746467ee2f544e3d