Merge commit '7e4c34329c98fc4279d658387b65ef4d041872a8' * commit '7e4c34329c98fc4279d658387b65ef4d041872a8': WifiService: Wifi power management change
Merge commit '7e4c34329c98fc4279d658387b65ef4d041872a8' * commit '7e4c34329c98fc4279d658387b65ef4d041872a8': WifiService: Wifi power management change