Add query and storage classes

Change-Id: I1a6649cd865b7fb424e28dfd8648c80f001adcd4
Merge remote-tracking branch 'upstream/master'