Merge "Remove the replacing surface code" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 1 Apr 2021 16:16:47 +0000 (16:16 +0000)
committerGerrit Code Review <gerrit@review>
Thu, 1 Apr 2021 16:16:47 +0000 (16:16 +0000)

Trivial merge