Merge \\"Fix QS gear metrics\\" into nyc-mr1-dev am: f90128c68d
am: ba3cd6d662

Change-Id: Id2a3ebc8ba2b9c12db758da3d30683b5281df8dc