Merge "Add 'reboot bootloader' to bootloader_message." am: a5538b87e8 am: 118e814bfe
am: 62aaba5a3f

Change-Id: Iff0eca5ba1522c3e51afc439d8008c7ad781b871