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

Change-Id: If1d069e8215eec3dec5b5b0cb826b7b2b2c41105