am 16c156ff: am 90a80bb8: Merge "Handle null BSSID" into jb-mr1-dev

* commit '16c156ff0c55a5716174a5af2adbae1c61ee99b9':
  Handle null BSSID