Merge "Support requesting and receiving wakeup events" am: bf152b14c4 am: 4971745cf4
am: 880974f111

Change-Id: I98aa768cf47938aa0996ddabbbc9feb9dae96f1e