Merge commit 'b1d07947050f9b1e703afb6bf0c1b92f24905c0e' * commit 'b1d07947050f9b1e703afb6bf0c1b92f24905c0e': Make ParcelUuid helper functions consistent.
Merge commit 'b1d07947050f9b1e703afb6bf0c1b92f24905c0e' * commit 'b1d07947050f9b1e703afb6bf0c1b92f24905c0e': Make ParcelUuid helper functions consistent.