Merge "trusty: storage: Allow starting without /data mounted"