Merge "Remove the dependency on bootloader_message" am: abf8c4191d

Change-Id: I423e8d25a9e160e88c306716cd75bd00cb1d6dbb