Merge "bootloader_message: Remove global std::string" am: 7b87949ae1 am: 76d80ba102
am: 8946524a79

Change-Id: I65d24597138563a61bc259246e5940948afb1158