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

* commit '664b5df781c2ee7784800a9d86c5ee33edeb512c':
  Fix an NPE in WifiService