Merge "Logging in StatsCompanionService" into pi-dev