Merge "Revert "Revert "Use IsMarked instead of Mark for profiling info.""" into oc-dev
am: 9b70ef325b

Change-Id: I9e78449108b52616193d8cc74343eaa2bd0ec785