Snap for 8736885 from 215c8609ff3ac0686bee8868e688048a2814bbe3 to mainline-go-resolv-release

Change-Id: I877f9d881793034f644c4591291e2558d7687db1