Cleanup & boot optimization

Change-Id: I05c084494ed4ab36586ca0c1c425cfe25bfcbe6c
NH2: WiFi

Change-Id: I822e6b567c948d98a61c3521686dd519fa341ccc