Fix wifi connectivity issues. am: 96151d642e

Original change: undetermined

Change-Id: I199eafa5702c1f804c1de8a0a2b2e45095e7f448