Merge "[WIFI] Add null check before variable access to prevent an APR" into pi-dev
am: 4aef2aafbe

Change-Id: Ib834eb211864e02ae4b79e5fe530b0224768d8ec