Snap for 8820681 from e73b7a73838ad5e82b17641d6a389d587ad02cc3 to mainline-go-wifi-release

Change-Id: I854180200162c3d4631def65c7ac2c76d4490a6f