Merge "Remove all ignored files in SBOM diffs, which have been fixed in the following CLs:" into main