Add new metrics tags

Change-Id: I79c5609237246a2835c41fffed1092f859cbd4d8
Fixes: 35431326
Fixes: 35430849
Test: Manual; the tree builds and the constants can be accessed by other classes
1 file changed