Merge "Pass the supportQ flag to stats-log-api-gen"