Snap for 8736029 from 926cbe10fd68badd1190c41fe0d87fe0fd966b1e to mainline-go-tethering-release

Change-Id: I18d2873788310be26745905499ee58749c0c6827