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

Change-Id: I4c19f1cdfe7a9fb47aad23a21b0aa0ae8e03277a