Merge "Implement Reboot bootloader via bootloader_message" am: e759c83bde
am: d1b560c6f9

Change-Id: Ie57df293a41803c62cc8a9226c238047236b4592