Merge \"boot_control_copy: Track the the bootloader_message struct change.\"
am: 42ca0e1992

Change-Id: If4d94cbe24619b3e9f7f7924d2e76dfe25b78f46