Cherry-pick from commit 415f523f7ce4c7e33fa70ea003f265e5b53faa20, with small conflict resolution. Bug: 129510344 Test: m, boots, wifi connects, resolves DNS Change-Id: Idf24f42a86bbfcc89e3ea8cf50d1b705d72ac613 Merged-In: Idf24f42a86bbfcc89e3ea8cf50d1b705d72ac613 Merged-In: Ia08104f839ef37139a8761e2e625bb10c94c275f