Merge "Add bssid field in the ScanResultInfo class."