Merge branch 'devel/master' into devel/graphics 24/253124/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 4 Feb 2021 17:55:56 +0000 (17:55 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 4 Feb 2021 17:57:58 +0000 (17:57 +0000)
Change-Id: I761cfc0f25774b14003e936be295501aeb71bcd1


Trivial merge