Merge "Cleanup threading in StatsCompanionService" into rvc-dev
tree: 9aeb841773ba7c8e6fb57fb045d7d1949179c378
  1. apex/