Clean up RecoveryController imports

Some code is still importing constants from the deprecated old API.

Test: manual
Change-Id: I7a9e7e25c21641294c7af18bf2f83543f425edb2
4 files changed