Snap for 8736885 from 92f369e880de8a5c063869e790547911a767a84b to mainline-go-resolv-release

Change-Id: Ieef92d16989055106bf6525ee52a26b278a88451