Adding query definition to query entity

Change-Id: Ide39070bed8262cb5846200137919ea771cdc381
Merge "Adding query definition to query entity"