Merge changes Iccb6d089,I9c50a59f into nyc-dr1-dev

* changes:
  Network switch notifications: rate & daily limits
  Network Switching Notifications: add unit tests