Merge "Wakeup packet events: addressing a few comments" am: 67d16ec1ab
am: a35bbadeba

Change-Id: I33eeb421cff21efdaa409d27fb130ff4754ac6b0