Snap for 8564071 from 6661c46def7a4e79589003500e402827370bd285 to mainline-wifi-release

Change-Id: I9558153f5bbb4d70735d819518f29b64f4045100