Merge \\\"boot_control_copy: Track the the bootloader_message struct change.\\\" am: 42ca0e1992 am: 713a9a5c19
am: 22da4e5214

Change-Id: I5cbf51a14a7c8560d108a371f71167bda753f03e