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

Change-Id: I8fefecb4cb860570a62af532b77a2dff8b9e863e