Merge changes I47b91c0c,I630c0e49 into main

* changes:
  Report sent query count
  Report service info callback metrics data