[automerger skipped] Merge "Fix RegistrationManager API uses" am: 9b7d867a18 am: aab9cfc30d
am: df10cb96a9 -s ours
am skip reason: change_id I779ad8d368517691c4ff63c6407460f712652188 with SHA1 6fb1882290 is in history

Change-Id: I2a7b0c990df6230df85cef8b0bd43a54c23d3c46