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

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