Merge "Use bssid instead of pending_bssid" into jb-mr1-dev