Snap for 8820681 from 0790ccba6a82147e2fadcc4b94996475512d817a to mainline-go-wifi-release

Change-Id: I77f3ec0e1475bc6a133adba5fcd848820236cbe3