Merge change 25412 into eclair

* changes:
  Make ParcelUuid helper functions consistent.