Merge "Stats: updated the order of service registration" into sc-dev