Merge "Add non-dds check for startNetworkScan" into qt-dev am: 53861e16c3
am: 0639b1cc0d

Change-Id: If9ba81a2802a5539529c348b99b53d2f7876cc99