Merge "Don't request information on unregistered callbacks" am: 14e3db3de5 am: 042be0bd84
am: 507feec43a

Change-Id: I9d43269d4b3d3c61110a0ce07cb3cf8cd200aab6