Merge "Add update_bootloader_message() to fix two-step OTAs."