Code refactoring in ag/5261950

Test: statsd test
Change-Id: I25eaa3b8572074305e61506a693b636adbd3218d
1 file changed