Improved wifi battery consumption

Change-Id: I436f82e45fc617e0192247d37815c8e849cdea0d