Merge "Merge branch 'devel/master' into devel/graphics" into devel/master
authorDavid Steele <david.steele@samsung.com>
Wed, 26 May 2021 12:27:08 +0000 (12:27 +0000)
committerGerrit Code Review <gerrit@review>
Wed, 26 May 2021 12:27:08 +0000 (12:27 +0000)

Trivial merge