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

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