Merge "Revert "Remove deprecated RecoveryController API."" into pi-dev