Merge "Fix lint warnings in Support4Demos and Support7Demos"