Snap for 8708169 from 4745695a5f4f0e5c787b748f18ccd165914ede75 to mainline-go-tethering-release

Change-Id: I9b98838ae3bc728a1ee55d25fb5e66453cf92f6e