Snap for 8736029 from 7a321c53da653c64808f012dd163535d8096012d to mainline-go-tethering-release

Change-Id: Ie6375ff909dfb56aa878383b00d26dfefb2c0134