Merge "Fix extracting 32-bit uuid error via calling method uuidToBytes" am: ac421b8f44
am: 8c65620d31

Change-Id: I70ded26f7487e0cf0cbb2f3fa1184c85ed00b765