am ce3bd309: Merge "Parse UUID string with Long.parseLong"

* commit 'ce3bd309b12e9552c05d5a59a06d7883618c5ca0':
  Parse UUID string with Long.parseLong