Merge "update export-demo.xml"