Merge "New API to stop service resolution"