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

Change-Id: Id8d9c3f67f7a850af69069abee86adfc62841b28