Merge "Accomoditing API Review feedback for WifiScanner"