Merge "removing ineffective code in WifiService.java"