Merge "bootqca: Avoiding SPI NOR being read as psudo-NAND"