Merge "Add more metrics for QS" into nyc-dev am: 98bad0e
am: d4838f6

* commit 'd4838f657811ee592df064886d91231ab4fd3c0c':
  Add more metrics for QS

Change-Id: I1b3d67cb3625f5db20b4bbb310da40005426e69e