Merge "Fix logic to figure out what /data fstab entry was mounted"