Merge "Replace the hidden ProxyInfo methods usage"