Merge commit '4f377394a9a7d66dd2f0ecba8310e512d85674a6' * commit '4f377394a9a7d66dd2f0ecba8310e512d85674a6': Add a parcelable version of UUID file.
Merge commit '4f377394a9a7d66dd2f0ecba8310e512d85674a6' * commit '4f377394a9a7d66dd2f0ecba8310e512d85674a6': Add a parcelable version of UUID file.