Merge "blkid: Resolve to the exFAT uuid change on reboot." am: 6eac3894a6
am: 68acc00e57

Change-Id: Id7f4617e1695fc74f98da60d389adb747ab137d5