Merge "Fix handling of InterruptedException in AAI-Champ"