Snap for 8564071 from b6c4ab13d63f799b51fcc22cc9423e8440d99eea to mainline-wifi-release

Change-Id: Ibbf4116e5b82e1d9d30c80b8b2847dd29ccadfa6