Refactoring again. Make importer handle ServiceConnection properly.

Bug: 2733143
Change-Id: I3189ca396da4d661a05530c02a3c46df6db24701
2 files changed