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

Change-Id: I0d77a84d40e7644d5f98935fc02d30c0fd9c3200