Merge "fs_mgr: Track the bootloader_message struct change."