Merge "Remove EXTRA_PROXY_INFO." into sc-dev