Merge "Fix statsd_test TestOnDumpReportEraseData"