Merge "Update lint baseline for services" into main