Merge "Adding additional wifi power metrics to wifi power metrics"