Merge "Light refactors to packet wakeup events." am: e887e2b9c1 am: c6dc6baf4f
am: 90e68c6869  -s ours

Change-Id: Icf9bbf1b0d20acaf0fa4f7cf60fd390dc29a00b3