Merge "Fix an NPE in WifiService" into klp-dev