Merge "Fix bug in statsd_test" into rvc-dev am: 877b5b2196 am: 9f9244d2a6 am: ffab801d26

Change-Id: I8e644146e15918b6d0ea3ed635b7788c12839c25