Merge "Create wrapper function for set_wakeup_callback" am: d848876ff7
am: 12400958a8

Change-Id: I384ae8f587795c00c9a42ead2fae9a46bc4ca5fd