Merge "import: Don't try duplicate detection when the sha1 is unavailable" into REL1_31