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

Change-Id: Id4e843eef00a623353fe3027de13460aa92e699f