Updates to the export script

Change-Id: I52ad18966c9ff6bb0c66c3857dd00e79c175360b
Merge "Updates to the export script"