Snap for 8736029 from e327c6bd1fc743a3f7ba02aa37e72fe756550564 to mainline-go-tethering-release

Change-Id: I840f7c6f062e05f2f14767010667ef938d36615e