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

Change-Id: I57e8f3e20679baf797e36557f649593298091d4a