[dali_1.3.17] Merge branch 'devel/master' 47/173747/1
authorUmar <m.umar@partner.samsung.com>
Fri, 23 Mar 2018 13:42:00 +0000 (13:42 +0000)
committerUmar <m.umar@partner.samsung.com>
Fri, 23 Mar 2018 13:42:00 +0000 (13:42 +0000)
Change-Id: I92a7920b5b91cdc55970090f37430249007d8fac


Trivial merge