Merge "manta: wifi.on use average power including sleep mode" into jb-mr1-dev