Merge "Fix ConnectivityServiceTest fail." into qt-dev