Update to Recovery V2

Change-Id: Ia1d1d21f1854ebb13e3daaf3fb306bca1645d867