otter2: Fix up reboot recovery

Change-Id: I8bb18ca41cf295f0249abf4d329b77aad1a0df91