Fix build failure in branch azure/m18-master. Cherry-pick changes from m16.
Merge request template
- Fix build failure in branch azure/m18-master.
- Cherry-pick changes from m16.
- Update the NOTICE file to the one generated in the pipeline.
Edited by Adrian Sali