Merge "Resolve STATSD and batterystats race condition" into pi-dev