Update XYZ to work again since several maps classes moved around. am: df833a2d am: 3b684489 am: 4341c038 am: 94492e7f Change-Id: I304394545dde10aba6d6ffb9b3d14d6ab0230b37