Merge "Some fixes in StatsdStats, and add some unit tests"