Merge branch 'devel/master' into devel/graphics 45/256645/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 8 Apr 2021 09:55:01 +0000 (10:55 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 8 Apr 2021 09:55:01 +0000 (10:55 +0100)
Change-Id: Ia5be457d3557f615a93513587cb69d3ba84ee982


Trivial merge