Merge "Remove package name parameter from setRecoveryStatus"