Fixes: 147508316 Test: statsd_testdrive 90 Change-Id: Ibf71098dad6a1cae354ec83d461c4e0b42c47065 (cherry picked from commit 6be1669a)