Merge branch 'devel/master' into devel/graphics 96/258796/1
authorDavid Steele <david.steele@samsung.com>
Tue, 25 May 2021 23:29:00 +0000 (00:29 +0100)
committerDavid Steele <david.steele@samsung.com>
Tue, 25 May 2021 23:29:00 +0000 (00:29 +0100)
Change-Id: I78062a8d826c1df5c499337e7bcae2a62dff2372


Trivial merge