Merge "[277422] Prepares for a Spliterator implementation in Pass2Parser"