Merge "Fail sanity check when BSSID is empty in RTT request" into mnc-dev