Merge "Update stats-log-api-gen source based off of google3 presubmit checks"