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

Change-Id: Idd102961c422be5c94e4bf92c3aaae7f660f4313