Fix token buffer indexing
BUG: 415249 BUG: 415463
FIXED-IN: 19.12.1 (cherry picked from commit 90b4f33965b9be2188af2e7bc223b88744a5c992)