Merge "Skip reporting stats without enough samples" into sc-dev