Merge "Work around an angler bootloader bug." am: 9eab787560 am: d09dc85d63
am: e3ea99ddfe

* commit 'e3ea99ddfe1ff4a37794340ff1bea97f67aae796':
  Work around an angler bootloader bug.