Figured out layout of the QueryStore interface

Change-Id: I97f4c4bfeac1f26e62a8d4cba3f7224179564342
Merge "Figured out layout of the QueryStore interface"