Merge "RecoverySystem: update comment to reflect signature changes"