Merge "Remove init_second_stage.recovery dep." am: 6a581b7b66
am: daf4d47086

Change-Id: Ia2f793c01febe4cf44e8031df1ff4168e5ba2333