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

Change-Id: Ia77a11df8f4e4ed64df96b0323c27f8057bd2992