Merge changes Ie2676b20,Ie8db6f85

* changes:
  Connectivity metrics: add WakeupStats events
  Connectivity metrics: collect NFLOG wakeup events