Merge "Synchronize adapter registration with mCallbacks" am: a37b682ee4

Change-Id: I54c425d364aa704d2f9815c107eb1a3835cecb83