Merge "Import: Handle uploads with sha1 starting with 0 properly"