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

Change-Id: I5ab5b007323d5c529d9687b43b0441860c863a7a