Added new fingerprint metric categories. Test: Manual Fixes: 260072451 Flag: EXEMPT bugfix Change-Id: I421dde14b08737e2900d4ddbededcc713b52eb84