fixes for importer.

Change-Id: Ic0a97cf92b3ccc2301d1a4716bbb82da242440cc