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

Change-Id: Ibb42b84f34ff402aa0b3f539d7541e6568d09fab