Merge "Synchronize adapter registration with mCallbacks" am: a37b682ee4 am: 599bfbca4a am: 5c8208c5fe am: 9be10030d8

Change-Id: I1ab0db6b75284cba10a8a83ad7705b219d5fabb7