Merge \\"Record UID of wakeup packets\\" into nyc-mr1-dev am: 117cf8de91
am: d279c1291e

Change-Id: I6973342d48a8a8cebe8f4515c6d67d271dbcf7f7