Merge "servicemanager: guaranteeClient on wait register"