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

Change-Id: I5c7f3a2a60f74ef9787d06b875f92407680545c8