Fixup presubmit errors and violations in recent commit
Introduced in commit 2a5cd57e047106fe144fd5b5177e1227463b6025.