Fixed scap variable exporting

Change-Id: I3e9a09e8d76ebfdce2cfb022b2ae148cf61790ea
Merge "Fixed scap variable exporting" into production