Merge "Add L2~L4 information to packet wakeup logs and metrics"