Update XYZ to work again since several maps classes moved around. am: df833a2d am: 3b684489 am: 6d8740c3 am: 088a1e82 Change-Id: I5e958a8d9433f949a128c216f8ee7b47f89e0495