Merge "Make BackupRestoreEventLogger methods void"