Merge "init: don't start tombstoned until /data is mounted."