Merge "Only disable Wi-Fi IP serving on specific interface, if available" am: 6428e1a4d4 am: e675273dbc
am: e13b93c585

Change-Id: Iac19359fd8712fa6a135f31bed9f0da97b3f2977