Snap for 8564071 from 197e2599b86357a9d707053508d8f063ac04ba7c to mainline-wifi-release

Change-Id: I91dc841a8c57bb1947346b5ea496be348d4e6b9a