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

Change-Id: Iaf63db082453bebed08e364abe9c657bad7d4a41