Merge "import new view enums into MetricsLogger" into mnc-dev