Merge "Use one type for UUID (2/5)" am: 5a234f0022 am: cd2b33e139 am: ceea7d883b
am: 43b810774c

Change-Id: I275dd8be6ce9859e2e60e35efe9dfbe0fc940fa5