Merge "Harden against invalid paths." into pi-dev