Improving some import-related error messages

Present tense sounds stilted here.

Change-Id: I69761486a584b48ccf7df0d07a9ba52885a217a1
Merge "Improving some import-related error messages"