Auto import functionality un-hacked slightly

Change-Id: Ibe6ede721307313a5ce059e859a1f1dbd2c2471c