Resolve uuid

Change-Id: I588f8173019d17b14d99b417e0bab072e36e05bf