Merge "PIP: Rename closeInternal to closePipInternal" into nyc-dev