Merge "Remove manager dependency from biometric services"