Added uuid import

Change-Id: Ibfe0844792745da78668aa63bebbcef86c406304