Update ingest importer code

Change-Id: I0f3b0809deead2f49501a5309f0ddab9c911274f
29 files changed