Snap for 8736885 from 62c92a3d7f55d300f21acc604f5feb711fa815b2 to mainline-go-resolv-release

Change-Id: I6ec0f53b50529b72561c85ba58e5c6b039d66cbb