Merge "WifiConfiguration: Remove dead commented code" into nyc-dev