Merge "Fix RegistrationManager API uses"