Merge "Update XYZ to work again since several maps classes moved around. am: df833a2d am: 3b684489 am: 6d8740c3" into nyc-mr2-dev-plus-aosp