Hot fix for UUID property type

Change-Id: Ice36feed24c2fbdd0368e5e4cc592d7c2f18dc48