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

Change-Id: I4c340986a5f005a9fcfff2b6f60aa2c0831923c0