Merge branch 'devel/master' into devel/graphics 69/254369/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Mon, 1 Mar 2021 19:10:36 +0000 (19:10 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Mon, 1 Mar 2021 19:10:36 +0000 (19:10 +0000)
Change-Id: I4a5b22ad8eebe88d8eae1f8f5412898d1ec53958


Trivial merge