Merge "[Non-ACR][msg-service][coverity fixes]" into tizen