Merge "Parse UUID string with Long.parseLong"