Merge "Fix failing hprof DCHECK"