Merge "Check /mnt/expand paths as if /data." into pi-dev