Actually don't start tombstoned until /data is mounted. am: 0ad5107e51 am: 1170d8201d am: bf8bd27bb3
am: 32d18e2204

Change-Id: I45fe22d5b83e6399aadc374976986e7f660d9eba