Issue #12068: Fix appears to have worked; added more diagnostics for rare failures.
Issue #12068: Fix appears to have worked; added more diagnostics for rare failures.

sk-/python2.7-type-annotator,sk-/python2.7-type-annotator,sk-/python2.7-type-annotator