Merge "WifiScanner: Partial revert of ag/12269583"