[TO_STAGE] Bug 1007711: Fix upgraded gear count reporting