This fixes the payload counts not being tracked correctly when payload types repeat after the tracker rolls over. Change-Id: I16208ef73f3af3b051b96541a4c145b323cef7b2