Snap for 8820681 from 2aaa9747aa9edcf133411e2c7d5d87fd7a50ebdf to mainline-go-wifi-release

Change-Id: I2e608500e5007be002f3fe30f4eff5ba58d24c00