Merge "ITS: exit test_ae_af gracefully if 3A doesn't converge" into sc-dev