Merge change 25325 into eclair

* changes:
  Add a parcelable version of UUID file.