Merge "fix presubmit check configurations"