Snap for 8857176 from 6e5773dd058d2af5ef004863ae47a6938781c692 to mainline-go-wifi-release

Change-Id: Ieb448f8fe8a700cdae95c112383c8dc4e7c99d9e