Merge "Fix statsd_test unit tests for TestKeyValuePairsEvent"