Automated cherry pick of #1232: Use errors.As so we can detect wrapped errors, and check for#1326