am 525cfc01: am baafac4a: am ce10d7a5: am 1bd310e1: Merge "import more metrics enums" into mnc-dev

* commit '525cfc010593763e6ec88f62e4b7dd005865ecdf':
  import more metrics enums