Merge "add more power manager metrics" into mnc-dev