Merge "Rename set_wakeup_callback" am: 7e3de17f3d am: 5611305abe
am: 9eb7d2e002

Change-Id: I1c50e19d06d3f667f9eb4e00156d22494cbb44c3