Merge "Revert "write_bootloader_message(<options>) should not reset stage field.""
am: c908f4f0e3

Change-Id: Ia24a7db9ee7dd655e1aa0eabfbe3cdf47b011d40