[Bug 226222] Merge Review: oprofile