Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev
tree: 37808f380adaa5c1a99b2bbec5b9a866e1c0fbc6
  1. core/
  2. services/
  3. tests/