Merge changes I3466008a,I455d531e into main

* changes:
  Minimal formatting fixes in VDM Demo.
  Revert^2 "Add VDM Demo app in gerrit w/o formatting"