Merge "OPP: Remove markBatchFailed with no arguments"