Merge "Fix QS gear metrics" into nyc-mr1-dev