Merge "Owners file for StatsCompanionService"