Fixes to make statsd actually work

Change-Id: I10f46507ce452e9a9c8352019c008d3698a341d7