Merge "Remove implementation of deprecated RecoveryController methods." into pi-dev