Snap for 8164116 from 8853a7bbc17f54b5dc2f74435a93b331b73e0cff to mainline-wifi-release

Change-Id: I2d900cc3394389cc458a33559af6300b5007c209