Merge "Fix logic to figure out what /data fstab entry was mounted"
am: 23a1dd630b

Change-Id: I13c1544963db2161f24d5f3d0f9c644838951ad1