Snap for 8736029 from 8f1564262a5d3b1638d877319ad5aa3e88e02724 to mainline-go-tethering-release

Change-Id: Ic64bddbf2addb21b97200db1459fbfc30d5da3b8