Merge "Revert "Revert "Use IsMarked instead of Mark for profiling info."""
am: ed00ddb614

Change-Id: I2696a9bd18ed9347213a109ad938cafafafd7955