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

Change-Id: I5b7aacc4381d5942fc10d044f195fe2390a7c3b3