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

Change-Id: I158d82e994a207fc1d95205882a72596de9a75a6