Merge "Tracking change to dns proxy protocol"