Merge "Do thumb attempt-failures limitting via sha1 instead of name."