Merge "Record UID of wakeup packets" into nyc-mr1-dev