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

Change-Id: Ib1f2bd27b7250556b503f03d1a53619b8fc5b595