Merge "Start tombstoned early in post-fs-data."