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

Change-Id: I391598b80e3a04cef9c811c8c158870849e55ff7