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

Change-Id: Ic4f25b7c7f1f6e1d285c1e3e79214e0d8b362602