Improve proxy comparison support (#14639)

Change-Id: I114ea5bf9d55c78826c1163206caf585b96143ef