Merge "Change PacProxySelector to return unresolved addr" into klp-dev