Merge "tombstoned: start immediately after /data is mounted."