Merge "Support requesting and receiving wakeup events"
am: bf152b14c4

Change-Id: I594d4b5921ec6f0f8f73b88fd4d0e06278838553