Snap for 8736029 from 1c2c0f9edc2fddd036b49c23edb1f81f29ecd021 to mainline-go-wifi-release

Change-Id: I83251d1b00525a79541115f3adeed99681d73b65