Merge changes I9ea3677d,I0a59dce8

* changes:
  Migrate away from using ServiceManager
  Migrate StatsManager to apex
tree: d5322d5fe5e73b1bbd1d05d3d5828d9acb651840
  1. apex/