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

Change-Id: I329f397fb866ebb63df5688f9c2e353f49b36aa9