Merge "Move bootloader_override property" into udc-dev