Merge "Handle projects not using stable/ branch names"