Snap for 8736029 from d52dde30d24325a1abb09f8bc24e76636f1d5746 to mainline-go-tethering-release

Change-Id: Id3efde397d260981a22002a79d57538c82f2952a