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

Change-Id: Icdea09484bf16f01450fb3cf8734f2c013cf5052