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

Change-Id: I3434d6657ca905b12fb73beca65473f3149202bb