Merge "Service mgr bug fix"