Merge "DO NOT MERGE: Accomoditing API Review feedback for WifiScanner" into lmp-preview-dev