Change metric categories to what research defined

Bug: 70871
Change-Id: I56da7edf9949fd8ed978cd9257c2128fba1e89c9