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

Change-Id: I9c126b890e5802e0e409869db3351818daa88b1f