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

Change-Id: Id9834a858d307ce3057e270347a3088b074d8863