Merge "ART: Make run-test 931 more defensive wrt/ shutdown"