Update XYZ to work again since several maps classes moved around.

Change-Id: I867801278d1f83d848925be7e50bd7ea9c1f497a
1 file changed