LT-14372, Lift import can change stem to affix with residue

Change-Id: I5a336c9c745874a48c0bf409a7111f57fc51a913