Clean up ExportDemoTest

Change-Id: I28574b6c83cbd1128ad97b4868cc365336a7d4b8
Merge "Clean up ExportDemoTest"