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

Change-Id: I45d4ed729f8d648769459bd1adc5c4852ef52cfa