Merge "Update comments around flat-batch service" into stable/boron