Snap for 8564071 from b092e42009436a4473c4775398df76dc8158c2da to mainline-wifi-release

Change-Id: Ifd5ce33293be2a88d95ff81ce444e7510de5b847