Change presubmit flow

Modify presubmit flow as described in #1010