otter: Fix up reboot recovery

Change-Id: I73f738049ac555b39f3315a4030ab7d31dbc0cae
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0