Added imported query resolution.

Change-Id: Ife636dd3afce62b0d91d9b7365959fd36e6a9c47
15 files changed