Merge "[277422] Switch Pass2Parser to use BufferingRafPositionInputStream"