(CDAP-512) Service system metrics

Good catch.