Snap for 8736029 from 6882fd623436af57a685e609aed01a079af35a08 to mainline-go-tethering-release

Change-Id: I8b2b19c0203e26ee7f72108ecde0afb9e6d3f795