Added Query Stats and charts

Change-Id: I25f2df4a540ea7a666f760ff02963cc3dd011e98
Merge "Added Query Stats and charts"