Merge "Cleanup commit to remove @SkipPresubmit and fix nits"