Merge "sdp: Use complete Uuids for comparisons"
am: 63887690c1

Change-Id: I6f394cdf3ca7ac82a011baadb282b2fef999852a