* Usage Stats: Rename service to use a more idiomatic name * Usage Stats: Update MetricsFunc definition and implementations * Revert "Usage Stats: Rename service to use a more idiomatic name" This reverts commit910ecce3e8. * Usage Stats: Update MetricsFunc definition and implementations (cherry picked from commitf601921670)