Merge "git-ignore transient files created by aidegen" into udc-qpr-dev