Merge "Light refactors to packet wakeup events."
am: e887e2b9c1

Change-Id: I40f637114cbfc04bce4058af0a1f43f38bd461db