Merge "Allow proxies to be compared."
am: 342c3da3dc

Change-Id: I49c3ca0049e70bf94cea5816506d4a4a4e0c2500