Fix Device and Payload response
Fix Device and Payload response

Bug fix due to change introduced in  https://gerrit.iotivity.org/gerrit/#/c/12283/

Change-Id: Ib6b03f4296c8ef0fb1ac7ac79ff1023856a070bc
Signed-off-by: Habib Virji <40be98b50fb6c4d79bd282a617e2cc82e300d47f@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14419
Tested-by: jenkins-iotivity <09cb29e8a2b473a2c978382eec13ee06fa017bda@opendaylight.org>
Reviewed-by: Dan Mihai <ba8e1833495515b49ded9e20cae80a8129155aa9@microsoft.com>
Reviewed-by: Soemin Tjong <3568098a2f7652f8955d8972f2edda282f25325b@microsoft.com>
Reviewed-by: Larry Sachs <87b901be7a441bcf97cbe259c532df419aac788e@intel.com>
Reviewed-by: Uze Choi <3a26c91d8a4a3c9e246e43339f4782bb2483aece@samsung.com>
Reviewed-by: Ashok Babu Channa <72ac47ef856ca3d131a57cba474ebed48591eeff@samsung.com>

rzr/iotivity,iotivity/iotivity,rzr/iotivity,iotivity/iotivity,iotivity/iotivity,iotivity/iotivity,rzr/iotivity,iotivity/iotivity,iotivity/iotivity,rzr/iotivity,rzr/iotivity,iotivity/iotivity,iotivity/iotivity,rzr/iotivity,rzr/iotivity