Fix class name of query entity

Change-Id: I607d2ae2d39f8ddb4d5258897309a30abc3a2bca
Merge "Fix class name of query entity"