Merge "MAP: Fix bugs in SDP search result handling"