Merge "Remove WifiScanner annotation from public API" into udc-dev