Merge "Remove the debug code for bspatch flakiness"