Merge "Work around an angler bootloader bug."