Add test for querybuilder

Change-Id: Idbac7832030ead30a8bdd43a727164f508a4598e
Small fixes in Querybuilder

Change-Id: Ice92cc4b9152e21c0586866918aedb63b141bcaa
Remove unsafe function call

Change-Id: I842c8d140f160868a4ad141acf0e180ae3ea6ade
Merge commit '01284ae8f515aa261a6ff2b8f4675030467c90c5'
Merge commit '91a2fe8ddcff4c75976a2ee5b5f96e49964037c3'
Merge commit '17da688326b2d7917bd13cec7653609c01414742'