Clean up clang tidy issues related to the demo branch, in preparation of a master branch merge.
Clean up clang tidy issues related to the demo branch, in preparation of a master branch merge.