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

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