Merge "Fix StatsCompanionService pull on bucket ends" into pi-dev