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

Change-Id: I1212c64e90572b7f45ca106c36ea89f37fb086ae