Merge "MAP-MNS: Cleanup sdp record on service shutdown"
am: 684ce8097a

Change-Id: I21dc628d2cf67be4135fe181b0477e691d8b49ba