(FR #1855) Refactor import hook to lower level

Change-Id: Iad4da4aab1cbca206b3a66b11023e928f0b4312e