Bug: 150194702
Test: Manual test with statsd_testdrive
Merged-In: If2abc419a92f1c53654fe7b2b11a15928bf7ba21
Change-Id: I42755a6bcc8bf86469f4d5a4608b32bedd9c89b5
(cherry picked from commit da3e1f17cd)
Bug: 150194702
Test: Manual test with statsd_testdrive
Merged-In: If2abc419a92f1c53654fe7b2b11a15928bf7ba21
Change-Id: I42755a6bcc8bf86469f4d5a4608b32bedd9c89b5
(cherry picked from commit da3e1f17cd)