Merge "Remove the code to apply yardstick patch"