Merge "Explicit null-check before use in FileIntegrityService"