Merge "Fix RegistrationManager API uses" am: 9b7d867a18
am: aab9cfc30d

Change-Id: I1b6ee8ad510eff65612cc8b6bfc60f2b920e2a9c