Merge "Add wipeOnError flag to NetworkStatsRecorder"