Merge \"fs_mgr: Track the bootloader_message struct change.\"
am: 4d34653720

Change-Id: I0590289d189d33c7844e8fd15cdd2df341dae7c4