Merge "Handle null BSSID" into jb-mr1-dev