Fix pytype failure processing (and merge related fix on stable)

Fix the pytype failure first, then merge the failure detection fix on stable. I ran the check-pytype script that's on stable on the default branch locally, without the pytype fix here, to verify that it works.