Merge "Updating use_sample_size to be include_sample_size"