Merge "Clean up ExportDemoTest"