Merge "[AWARE] Update metrics dumpsys" into oc-dr1-dev