Merge branch 'devel/master' into devel/graphics 28/253128/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 4 Feb 2021 18:09:40 +0000 (18:09 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 4 Feb 2021 18:09:45 +0000 (18:09 +0000)
Change-Id: I796ecb5ce8eb9990268bf1472e7585c2f38564c5


Trivial merge