Use UUID's built-in method to check if 2 UUIDs are the same

Change-Id: Ia42d194ff640426095d8b97284fc490f52d9bf28
Merge "Use UUID's built-in method to check if 2 UUIDs are the same"