android might have a 4096 token size
Merge branch 'AGPUSH-541'