back to working wifi for now and fix overlay

Change-Id: Ib08ed3b4e0ac92e2ccc0af9ec860a07aa9db4c5c