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

Change-Id: I05e4a0d99c92e1ae790e183b121e8dba30feae91