Merge "Using RegistrationManager was causing unintended public APIs" into rvc-dev am: c05ba6325d am: ae7d445b33

Change-Id: Ib30d02f5515ceccfb9ff2ec12d78f682526af7d4