Ah, sorry, I think there is a minor comment related to the tests that would be great to address, so I'm adding the "cleanup" label for now. Another presubmit should not be required since additional changes would be in tests only.