This reverts commit b35b5f7c. Reason for revert: move the refactoring/renaming to another CL. Test: statsd test Change-Id: Ia3445beb0df813adba0d3d6e137a363e694b5da1