Merge "Added useExternalScores field to WifiConfiguration." into nyc-dev