am 822d94f9: am 1ed51e42: am 9372228f: Merge "metrics: Consolidate constants in constants.h."

* commit '822d94f9351551da7e65b670c768c51da6b4bdae':
  metrics: Consolidate constants in constants.h.