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

Change-Id: Ie0255ab3641b3076304237638cdece824c940ac6