Regsiter Query classes

Change-Id: I272c4ff3f95bb350a29fd50a1c42d2fb3c2a0ad7
Merge "Regsiter Query classes"