Merge "Reuse xml parser logic to scrape preference xml files." into pi-dev