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

Change-Id: I28858f9bacca97bcc6d70860c9d5b8c358b5e7d5