Snap for 8857176 from ac851b04c1256097ee982d8eb83161fbe18fbe9b to mainline-go-wifi-release

Change-Id: I80251fb7aa10abaed143456713f14a20ca285627