Merge "Change to use proper type in vp{9,10}_token_state"