Merge remote-tracking branch 'origin/API6' into tizen_5.5
authoradmin <tizenapi@samsung.com>
Fri, 3 Jan 2020 15:51:52 +0000 (15:51 +0000)
committeradmin <tizenapi@samsung.com>
Fri, 3 Jan 2020 15:51:52 +0000 (15:51 +0000)

Trivial merge