Merge "Fix some of tests doesn't run on presubmit"