Move serviceCounter outside template function
am: 7860da3648

Change-Id: I0ffc7993dc036d74f86c3e1e3999403fc8fc11c9