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

Change-Id: I399e0a569f7994044316504ed4a6a1bff1acdbe3