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

Change-Id: Ia223b22eb9cf01a1314a5ee0740a14941090c3f6