Merge "Add # of location info to aggregate stats" into sc-dev