am 7354b834: Merge "Fix an NPE in WifiService" into klp-dev

* commit '7354b834fc53a9d1885553aea58f632df16a5655':
  Fix an NPE in WifiService