Merge "Add buffer usage for more consumers" into udc-mainline-prod