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