Organized imports of Query component

Change-Id: Ie6f3e985fca4d69132ad0ec165adeb294fadab2b