Snap for 8626064 from b3b241a42de2564056df82a34fc226cf6238bab8 to mainline-go-wifi-release

Change-Id: Iab7e9f7dec91e9ab02d5dabe5fc04ba4be4e63f3