Merge "Only disable Wi-Fi IP serving on specific interface, if available" into oc-dr1-dev
am: e9b908c7a6  -s ours

Change-Id: Ie2f3c211b7e0807db4e5d5bfcd158356fca9a0dd