Merge "[Mainline] Migrate ProxyInfo"