Merge "Check /mnt/expand paths as if /data." into pi-dev am: 64fc7a4b0c
am: 33aa0e6755

Change-Id: I0c4563ece7380a00ec73d8ba72d9b8a04644863e