Merge "Synchronize adapter registration with mCallbacks" into rvc-dev am: 04b2ace944

Change-Id: I2191d751f8c8a54968f39f918519fee0f191d9f2