Merge \\\\"Fix for PAC script function dnsResolve.\\\\" am: 94b900307e am: 40cc8034e3 am: 2193939e53
am: 52cb06256e

Change-Id: I8a1fa65917db1d5bfe6e15525fc99a34fada395c