Merge commit '7222997e342920efb45edc312318fc5751c9a0ef' * commit '7222997e342920efb45edc312318fc5751c9a0ef': Update power usage UI to follow WIFI data changes.
Merge commit '7222997e342920efb45edc312318fc5751c9a0ef' * commit '7222997e342920efb45edc312318fc5751c9a0ef': Update power usage UI to follow WIFI data changes.