Merge "Fix testDataDisconnectedNotification unit test." into oc-dr1-dev