am b481dae2: Merge "Fix invalid Wifi Network system crash" into klp-dev

* commit 'b481dae2f5238252d81dafeecf13d5f387824689':
  Fix invalid Wifi Network system crash