Change presubmit flow

Modify presubmit flow as described in #1010 
Or just:

```sh
git rebase upstream/$ONTO
```