Try to merge recent changes to Data.xml into the android version.