Fix lint errors introduced during cherry-pick