Merge "Revert "Allow proxies to be compared."" am: 2fc621f0a6 am: 0f0ee9cff5
am: 1978c1e528

Change-Id: I251ed8826c35e72a6aa7588d2f966e682b889da6