Merge "Mark all old RecoveryController APIs as deprecated"