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

Change-Id: I42fba1065d5424a9353ab4131eaee2c8f2feba96