am 1bd310e1: Merge "import more metrics enums" into mnc-dev

* commit '1bd310e18c50d4fd81207a3e2fe61cc694ee7607':
  import more metrics enums