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

Change-Id: I985603f149f03cb15e02def4b00f6d6a75b29dd4