Merge "Add update_bootloader_message() to fix two-step OTAs." am: 26d972c9d2 am: 9a707b08ef
am: cb15594696

Change-Id: I75415b9fef5209f0b55859c4ca921544c4a338c1