Merge "Don't request information on unregistered callbacks"
am: 14e3db3de5

Change-Id: I99bf9b6a092318cf5183b18d25bda36f9977ce4e