Merge "Validate NOT_CONGESTED and invalid plans." into pi-dev