Merge "Fix StatsCompanionService pull on bucket ends" into pi-dev
am: 925a04b775

Change-Id: I1aac27b4a83158b336e0fcff16a18a06ab310615