Merge "Remove deprecated RecoveryController API." into pi-dev
am: ce70473a89

Change-Id: I516537e788ea873cd85d58348897d386b8bd5a5d