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