Merge "Remove obsolete segment skip checks from tokenization."