Merge branch 'devel/master' into devel/graphics 11/253311/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Mon, 8 Feb 2021 17:48:59 +0000 (17:48 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Mon, 8 Feb 2021 17:49:17 +0000 (17:49 +0000)
Change-Id: Iae119f397bf89a67305cb79fdc4cb2f888a9c984


Trivial merge