Merge "Remove init_second_stage.recovery dep."