Snap for 11041982 from 5ad493ce1a6d335af300f7a2b6369b0a9de317f4 to mainline-wifi-release

Change-Id: Ie5f538fe03a993ea7ddbf3d769c1d5e078187c23