Merge branch 'devel/master' into devel/graphics 44/256644/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 8 Apr 2021 09:54:36 +0000 (10:54 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 8 Apr 2021 09:54:36 +0000 (10:54 +0100)
Change-Id: I64efe224f8dd1cce0af9b01a5c6a1a1e9ea8ac89


Trivial merge