This should help the stats be more consistent across system restarts. Change-Id: If1736608373aada8b55d72ecf80fbbc52bd288bd