Merge "Remove the dependency on bootloader_message"