Merge "Revert "sdp: Use complete Uuids for comparisons""
am: 92c6686781

Change-Id: I5146d41ae23c567cb22a993131c31e96cbdee627