Fixing exports

Change-Id: I7c1e5863cfc003e2cccd448d2e03f4b14de791d5
Merge "Fixing exports" into production