Merge "Fix erroneous self comparison in KeyValueBackupTaskTest"