Merge "Remove refererence from public API to flagged API in FileIntegrityManager" into main