Merge "add new enums to MetricsConstans" into mnc-dev