Merge "Move bootloader_override property"