Merge branch 'devel/master' into devel/graphics 71/254371/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Mon, 1 Mar 2021 19:11:32 +0000 (19:11 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Mon, 1 Mar 2021 19:11:32 +0000 (19:11 +0000)
Change-Id: Ie75ba5871fbfe21c539f14167d20518ef12b7921


Trivial merge