Merge "Revert "Fix bug in stats output for HBD.""