[dali_1.9.16] Merge branch 'devel/master' 65/236065/1
authorCheng-Shiun Tsai <cheng.tsai@samsung.com>
Fri, 12 Jun 2020 09:08:16 +0000 (10:08 +0100)
committerCheng-Shiun Tsai <cheng.tsai@samsung.com>
Fri, 12 Jun 2020 09:08:16 +0000 (10:08 +0100)
Change-Id: I98c4474309972aa93f4db976be3ecece3e52b16d


Trivial merge