Merge "Revert "Revert "Allow proxies to be compared."""
am: bd0cc65bef

Change-Id: Iedb8cd49e50c25ed3cf5fffc67fb25202a7d6740