Merge branch 'devel/master' into devel/graphics 24/256024/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 26 Mar 2021 16:22:40 +0000 (16:22 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 26 Mar 2021 16:22:40 +0000 (16:22 +0000)
Change-Id: Ie76202a1763a124c516e35cd2f720492eca88371


Trivial merge