Add more metrics for QS

Bug: 27851703
Change-Id: Iecd1eb739fa1a283b7964b6e0952673e5fb38e8f
4 files changed