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

Change-Id: I18ef2c5ecc87389d245653e582db6c43d9049211