Added QueryDeserializer

* Added QueryDeserializer
* Added QueryDeserializerTest
* Added QueryRountripTest (integration)
* Fixed some misalignments between serialization and deserialization code

Change-Id: I82d6fac3af661c44c1550e949521ea9f61654785
Merge "Added QueryDeserializer"