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

Change-Id: If722e40f94dc9b42da68ddafd9a7d2d30794c916