Fixes for product export.

Change-Id: I7078a5d0f7fac464b86a606b8c0b0cc0c2888625