Merge "Deprecating stats.conf in favor of static type:"