Merge "Delete unimplemented APIs from RecoveryController." into pi-dev am: 0ed26bc8b1
am: b0add1f630

Change-Id: I6a03ba603aa44d0ecc0b3b10dd27b896a4d0879f