Merge "init: Fix writing "reboot recovery" to BCB" am: a4b446d766 am: fb06eac118

Change-Id: Ie08572fb94b5d436eb52d376de16fb0686c1f351