Merge branch 'devel/master' into devel/graphics 57/253557/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Mon, 15 Feb 2021 11:40:46 +0000 (11:40 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Mon, 15 Feb 2021 11:40:46 +0000 (11:40 +0000)
Change-Id: I4e1280478df523045513591d354e83b84d723625


Trivial merge