Also allow setting the handler for async callbacks. Bug: 20503131 Change-Id: If9d24bce75c253a1c7f9c5d41ff5f6447b4622a1