Merge "Fix ConnectivityServiceTest fail." into qt-dev
tree: 41c03ae79b9ea9503b634fde1e36acf62d9219de
  1. core/
  2. services/
  3. tests/