Revert "Fix bug in stats output for HBD." This reverts commit c7780075ec0e87f74a1a5706dec914aad8dc9200. Change-Id: I2d2e1b387bf0c70cc7238ee4f8edab2aad873489