Bug: 36855921 Test: compile, wifi works with toggling Change-Id: Ib0819a2d552472e482e192a69530441cfc2c0fd7