Merge "Wakeup packet events: addressing a few comments" am: 67d16ec1 am: a35bbade am: 19625788 am: 98177f01 Change-Id: I7d57c0f2377f44bcf75e18c80c0306bbfccb9591