Merge "Delete unimplemented APIs from RecoveryController." into pi-dev