Follow our own bootable recovery

Change-Id: Ic1ae6eea32b23df66a02d9fdcb8e12be25953bda