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

Change-Id: I393964bb34fd9b318590ea135d05fa1220c569fa