am 548e12e1: Merge \\"Update proxy resolver and tests for V8 API changes.\\" am: 3451232e59
am: 0cfe31b2d0

Change-Id: I594b2062443e287a1e6f1126153afb99ea008979