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

Change-Id: Ic390d4b001ec63db78e5f8effc59a1c445153c6a