am 0e63a138: am 0c3d8f1c: Merge "replace temporary metrics categories with...
am 0e63a138: am 0c3d8f1c: Merge "replace temporary metrics categories with permanent ones." into mnc-dev
* commit '0e63a138':
replace temporary metrics categories with permanent ones.