Merge "Add system service support to credential manager"