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

Change-Id: Ibfaba811291cce3bed86a812d403cf1f598a1cf8