Merge "Using RegistrationManager was causing unintended public APIs"