Fixed wifi draining

Change-Id: Ie976332b280879bc2a592e7740eeee95609b9b72
Test msg

Change-Id: I368dd1991b74e56d6de15c2ba0477d7f7b2136d6