Merge "Dynamically stop services with multiple interfaces" am: 8b1d97c756 am: 14f9553634

Change-Id: I50351318670e8eb5e5dda4a155bf00e3aca08075