Merge "Don't try to report non-existent stats" into sc-dev