Fix build post presubmit fixes