Merge "recovery: reduce overall boot time"