Merge "Synchronize adapter registration with mCallbacks" am: a37b682ee4 am: 599bfbca4a

Change-Id: I9a9f5627475155ee7ae78219edcaece38766a167