Merge branch 'devel/master' into devel/graphics 29/258329/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 13 May 2021 12:04:11 +0000 (13:04 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 13 May 2021 12:04:11 +0000 (13:04 +0100)
Change-Id: Ib49f51f63ec81b44e39aa629f8a7d1e20f6b5bad


Trivial merge