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

Change-Id: I57be89b028af57662fd6052e4644cea44b435a2b