Merge "Revert "Remove deprecated RecoveryController API."" into pi-dev am: 4147a83ae5
am: 1ddd044e30

Change-Id: I493e7c21a1593066598687a4b403b15d67449c4e