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

Change-Id: I1a21b45e83df6dcba9960b4d09ef737242757db3