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

Change-Id: I267a7130f70fef654e0cd5209d32ff4115250e45