Merge "Avoid warnings for empty file sha1 keys"