Merge "Add a SkipPresubmit annotation"