Merge "Add the fixed test case back into presubmit"