Snap for 10447354 from 4b2f08b8aedab71db1f2cddfe55af5f6c68bc2f3 to mainline-wifi-release

Change-Id: I9669090d12604072cc7df1063c8ca9b8fab9a1ac