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

Change-Id: I8fc5e4d8a55bd67625bc679bc59c323a35f0a4a1