Merge "Fix the presubmit failure"