am 95d56ba2: am a3400a2c: (-s ours) am 1ed51e42: am 9372228f: Merge "metrics: Consolidate constants in constants.h."

* commit '95d56ba2c8b75145d4da5977b14feb85552039c7':