Finally removed hard-coded references to KAI locations
Finally removed hard-coded references to KAI locations


Former-commit-id: c73af74b0e2d5dc04740e8ab5cba47482b920235
Former-commit-id: ded1d0e31bac4091f0aa7f825cb425ea1116eda5
Former-commit-id: ba396801d15388594e24473fda344f5325e41537
cschladetsch/KAI,cschladetsch/KAI,cschladetsch/KAI