Merge "Revert "sdp: Use complete Uuids for comparisons""