Merge "Remove the dependency on bootloader_message" am: abf8c4191d am: 1a4a3f5504

Change-Id: Ic700e035b8b3fa769d3f3c2d0ba2895bf9014f06