Merge "firmware: avoid invalid fallback aborts by using killable wait"