Merge "Fix extracting 32-bit uuid error via calling method uuidToBytes" am: ac421b8f am: 8c65620d am: 311d031d Change-Id: I151f0dc74bfeca44db6aa0c428f8cfbb8b2d3891