Merge "Fix RegistrationManager API uses"
am: 9b7d867a18

Change-Id: I608ed544eaec56d9b4722976365d840a956c77ee