Snap for 7550640 from cc1945d397e61b1967bef5f5e11ebff6b303e68f to mainline-wifi-release

Change-Id: I2131bb714db8dedc6c5b79124d66a775fe49737e