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